From: Maxim Ermilov <zaspire@rambler.ru>
Date: Fri, 19 Feb 2010 16:42:36 +0000 (+0300)
Subject: fix selection of all-workspace windows
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10433
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cfd63c7d4c62129a3b614f34ed28621fae77eea0;p=gnome-shell.git

fix selection of all-workspace windows

all-workspace windows can be active on every workspace.
https://bugzilla.gnome.org/show_bug.cgi?id=603078
---

diff --git a/js/ui/main.js b/js/ui/main.js
index a749a0175..902ee5b02 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -400,13 +400,14 @@ function getRunDialog() {
  * activateWindow:
  * @window: the Meta.Window to activate
  * @time: (optional) current event time
+ * @workspaceNum: (optional) window's workspace number
  *
  * Activates @window, switching to its workspace first if necessary,
  * and switching out of the overview if it's currently active
  */
-function activateWindow(window, time) {
+function activateWindow(window, time, workspaceNum) {
     let activeWorkspaceNum = global.screen.get_active_workspace_index();
-    let windowWorkspaceNum = window.get_workspace().index();
+    let windowWorkspaceNum = (workspaceNum !== undefined) ? workspaceNum : window.get_workspace().index();
 
     if (!time)
         time = global.get_current_time();
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 7e67043ef..7a5f31f7a 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1417,7 +1417,7 @@ Workspace.prototype = {
     },
 
     _onCloneSelected : function (clone, time) {
-        Main.activateWindow(clone.metaWindow, time);
+        Main.activateWindow(clone.metaWindow, time, this.workspaceNum);
     },
 
     _removeSelf : function(actor, event) {